
<!DOCTYPE HTML>
<html lang="" >
    <head>
        <meta charset="UTF-8">
        <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
        <title>git分支管理 · GitBook</title>
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <meta name="description" content="">
        <meta name="generator" content="GitBook 3.2.3">
        
        
        
    
    <link rel="stylesheet" href="../gitbook/style.css">

    
            
                
                <link rel="stylesheet" href="../gitbook/gitbook-plugin-highlight/website.css">
                
            
                
                <link rel="stylesheet" href="../gitbook/gitbook-plugin-search/search.css">
                
            
                
                <link rel="stylesheet" href="../gitbook/gitbook-plugin-fontsettings/website.css">
                
            
        

    

    
        
    
        
    
        
    
        
    
        
    
        
    

        
    
    
    <meta name="HandheldFriendly" content="true"/>
    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
    <meta name="apple-mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-status-bar-style" content="black">
    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="../gitbook/images/apple-touch-icon-precomposed-152.png">
    <link rel="shortcut icon" href="../gitbook/images/favicon.ico" type="image/x-icon">

    
    <link rel="next" href="github使用.html" />
    
    
    <link rel="prev" href="git安装及使用.html" />
    

    </head>
    <body>
        
<div class="book">
    <div class="book-summary">
        
            
<div id="book-search-input" role="search">
    <input type="text" placeholder="Type to search" />
</div>

            
                <nav role="navigation">
                


<ul class="summary">
    
    

    

    
        
        <li class="header">笔记</li>
        
        
    
        <li class="chapter " data-level="1.1" data-path="../">
            
                <a href="../">
            
                    
                    Introduction
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.2" data-path="../阶段一笔记/1.操作系统——特殊的软件.html">
            
                <a href="../阶段一笔记/1.操作系统——特殊的软件.html">
            
                    
                    1.操作系统——特殊的软件
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.3" data-path="../阶段一笔记/2.命令.html">
            
                <a href="../阶段一笔记/2.命令.html">
            
                    
                    2.命令
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.4" data-path="../阶段一笔记/3.SSH客户端的简单使用.html">
            
                <a href="../阶段一笔记/3.SSH客户端的简单使用.html">
            
                    
                    3.SSH客户端的简单使用
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.5" data-path="../阶段一笔记/4.用户权限相关命令.html">
            
                <a href="../阶段一笔记/4.用户权限相关命令.html">
            
                    
                    4.用户权限相关命令
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.6" data-path="../阶段一笔记/5.系统信息相关命令.html">
            
                <a href="../阶段一笔记/5.系统信息相关命令.html">
            
                    
                    5.系统信息相关命令
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="1.7" data-path="../阶段一笔记/6.vi命令.html">
            
                <a href="../阶段一笔记/6.vi命令.html">
            
                    
                    6.vi命令
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">软件安装及其使用</li>
        
        
    

    
        
        <li class="header">pycharm</li>
        
        
    
        <li class="chapter " data-level="3.1" data-path="pycharm安装及配置.html">
            
                <a href="pycharm安装及配置.html">
            
                    
                    pycharm安装及配置
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="3.2" data-path="pycharm使用.html">
            
                <a href="pycharm使用.html">
            
                    
                    pycharm使用
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="3.3" data-path="pycharm激活问题.html">
            
                <a href="pycharm激活问题.html">
            
                    
                    pycharm激活问题
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">电子书搭建</li>
        
        
    
        <li class="chapter " data-level="4.1" data-path="gitbook安装.html">
            
                <a href="gitbook安装.html">
            
                    
                    gitbook安装
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2" >
            
                <span>
            
                    
                    git
            
                </span>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.2.1" data-path="git简要.html">
            
                <a href="git简要.html">
            
                    
                    git简要
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.2.2" data-path="git安装及使用.html">
            
                <a href="git安装及使用.html">
            
                    
                    git安装及使用
            
                </a>
            

            
        </li>
    
        <li class="chapter active" data-level="4.2.3" data-path="git分支管理.html">
            
                <a href="git分支管理.html">
            
                    
                    git分支管理
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    
        <li class="chapter " data-level="4.3" data-path="github使用.html">
            
                <a href="github使用.html">
            
                    
                    github使用
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.4" data-path="../搭建/gitee远程仓库搭建.html">
            
                <a href="../搭建/gitee远程仓库搭建.html">
            
                    
                    gitee远程仓库搭建
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.5" data-path="../搭建/客户端与服务端的搭建.html">
            
                <a href="../搭建/客户端与服务端的搭建.html">
            
                    
                    客户端与服务端的搭建
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.6" >
            
                <span>
            
                    
                    问题
            
                </span>
            

            
            <ul class="articles">
                
    
        <li class="chapter " data-level="4.6.1" data-path="../搭建/gitbook build没有summary.html">
            
                <a href="../搭建/gitbook build没有summary.html">
            
                    
                    gitbook build没有summary
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="4.6.2" data-path="../问题/typora结合picgo实现上传图片到gitee.html">
            
                <a href="../问题/typora结合picgo实现上传图片到gitee.html">
            
                    
                    typora结合picgo实现上传图片到gitee
            
                </a>
            

            
        </li>
    

            </ul>
            
        </li>
    

    
        
        <li class="header">软件工具</li>
        
        
    
        <li class="chapter " data-level="5.1" data-path="anaconda下载与使用.html">
            
                <a href="anaconda下载与使用.html">
            
                    
                    anaconda下载与配置
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="5.2" data-path="anaconda的使用.html">
            
                <a href="anaconda的使用.html">
            
                    
                    anaconda的使用
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="5.3" data-path="python3.6.4下载与安装.html">
            
                <a href="python3.6.4下载与安装.html">
            
                    
                    python3.6.4下载与安装
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="5.4" data-path="typora安装及配置.html">
            
                <a href="typora安装及配置.html">
            
                    
                    typora安装及配置
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="5.5" data-path="ubuntu  tool安装.html">
            
                <a href="ubuntu  tool安装.html">
            
                    
                    ubuntu  tool安装
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="5.6" data-path="Jetbrains系列产品重置试用方法.html">
            
                <a href="Jetbrains系列产品重置试用方法.html">
            
                    
                    Jetbrains系列产品重置试用方法
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">python学习</li>
        
        
    

    
        
        <li class="header">面对过程</li>
        
        
    
        <li class="chapter " data-level="7.1" data-path="../python面对过程学习/0.python学习.html">
            
                <a href="../python面对过程学习/0.python学习.html">
            
                    
                    0.python学习
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.2" data-path="../python面对过程学习/1.python简介.html">
            
                <a href="../python面对过程学习/1.python简介.html">
            
                    
                    1.python简介
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.3" data-path="../python面对过程学习/2.python程序no.1.html">
            
                <a href="../python面对过程学习/2.python程序no.1.html">
            
                    
                    2.python程序
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.4" data-path="../python面对过程学习/3.多文件项目的演练.html">
            
                <a href="../python面对过程学习/3.多文件项目的演练.html">
            
                    
                    3.多文件项目的演练
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.5" data-path="../python面对过程学习/4.程序注释.html">
            
                <a href="../python面对过程学习/4.程序注释.html">
            
                    
                    4.程序注释
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.6" data-path="../python面对过程学习/5.算数运算符.html">
            
                <a href="../python面对过程学习/5.算数运算符.html">
            
                    
                    5.算数运算符
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.7" data-path="../python面对过程学习/6.程序执行原理（科普）.html">
            
                <a href="../python面对过程学习/6.程序执行原理（科普）.html">
            
                    
                    6.程序执行原理（科普）
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.8" data-path="../python面对过程学习/7.变量的基本使用.html">
            
                <a href="../python面对过程学习/7.变量的基本使用.html">
            
                    
                    7.变量的基本使用
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.9" data-path="../python面对过程学习/8.变量的命名.html">
            
                <a href="../python面对过程学习/8.变量的命名.html">
            
                    
                    8.变量的命名
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.10" data-path="../python面对过程学习/9.判断（if）语句.html">
            
                <a href="../python面对过程学习/9.判断（if）语句.html">
            
                    
                    9.判断（if）语句
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.11" data-path="../python面对过程学习/10.运算符.html">
            
                <a href="../python面对过程学习/10.运算符.html">
            
                    
                    10.运算符.md
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.12" data-path="../python面对过程学习/11.循环.html">
            
                <a href="../python面对过程学习/11.循环.html">
            
                    
                    11.循环.md
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.13" data-path="../python面对过程学习/12.函数基础.html">
            
                <a href="../python面对过程学习/12.函数基础.html">
            
                    
                    12.函数基础
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.14" data-path="../python面对过程学习/13.高级变量类型.html">
            
                <a href="../python面对过程学习/13.高级变量类型.html">
            
                    
                    13.函数基础
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.15" data-path="../python面对过程学习/14.综合应用 —— 名片管理系统.html">
            
                <a href="../python面对过程学习/14.综合应用 —— 名片管理系统.html">
            
                    
                    14.综合应用 —— 名片管理系统
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.16" data-path="../python面对过程学习/15.变量进阶（理解）.html">
            
                <a href="../python面对过程学习/15.变量进阶（理解）.html">
            
                    
                    15.变量进阶（理解）
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="7.17" data-path="../python面对过程学习/16.函数进阶.html">
            
                <a href="../python面对过程学习/16.函数进阶.html">
            
                    
                    16.函数进阶
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">面对对象</li>
        
        
    
        <li class="chapter " data-level="8.1" data-path="../课余/编程exe.html">
            
                <a href="../课余/编程exe.html">
            
                    
                    编程exe
            
                </a>
            

            
        </li>
    

    
        
        <li class="header">问题</li>
        
        
    
        <li class="chapter " data-level="9.1" data-path="../问题/安装软件.html">
            
                <a href="../问题/安装软件.html">
            
                    
                    安装软件
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="9.2" data-path="../问题/激活码网站.html">
            
                <a href="../问题/激活码网站.html">
            
                    
                    激活码网站
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="9.3" data-path="../问题/虚拟机.html">
            
                <a href="../问题/虚拟机.html">
            
                    
                    虚拟机
            
                </a>
            

            
        </li>
    
        <li class="chapter " data-level="9.4" data-path="../问题/疑难杂症.html">
            
                <a href="../问题/疑难杂症.html">
            
                    
                    疑难杂症
            
                </a>
            

            
        </li>
    

    

    <li class="divider"></li>

    <li>
        <a href="https://www.gitbook.com" target="blank" class="gitbook-link">
            Published with GitBook
        </a>
    </li>
</ul>


                </nav>
            
        
    </div>

    <div class="book-body">
        
            <div class="body-inner">
                
                    

<div class="book-header" role="navigation">
    

    <!-- Title -->
    <h1>
        <i class="fa fa-circle-o-notch fa-spin"></i>
        <a href=".." >git分支管理</a>
    </h1>
</div>




                    <div class="page-wrapper" tabindex="-1" role="main">
                        <div class="page-inner">
                            
<div id="book-search-results">
    <div class="search-noresults">
    
                                <section class="normal markdown-section">
                                
                                <h3 id="&#x5206;&#x652F;&#x7BA1;&#x7406;"><strong>&#x5206;&#x652F;&#x7BA1;&#x7406;</strong></h3>
<p>&#x200B;        1.&#x6982;&#x5FF5;</p>
<p>&#x200B;                    <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121175525405.png" alt="image-20211121175525405"></p>
<p>&#x200B;                        <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121175533390.png" alt="image-20211121175533390"></p>
<p>&#x200B;        2.&#x521B;&#x5EFA;&#x4E0E;&#x5408;&#x5E76;&#x5206;&#x652F;</p>
<h5 id="git-branch-----------&#x2014;&#x2014;&#x67E5;&#x770B;&#x5F53;&#x524D;&#x6709;&#x51E0;&#x4E2A;&#x5206;&#x652F;"><strong><code>git branch</code>           &#x2014;&#x2014;&#x67E5;&#x770B;&#x5F53;&#x524D;&#x6709;&#x51E0;&#x4E2A;&#x5206;&#x652F;</strong></h5>
<p>&#x200B;                                <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121175746932.png" alt="image-20211121175746932"></p>
<h5 id="git-checkout--b-&#x5206;&#x652F;&#x540D;-------&#x2014;&#x2014;&#x521B;&#x5EFA;&#x5206;&#x652F;"><strong><code>git checkout -b &#x5206;&#x652F;&#x540D;</code>       &#x2014;&#x2014;&#x521B;&#x5EFA;&#x5206;&#x652F;</strong></h5>
<p>&#x200B;                                <img src="../tupian/image-20211121175841750.png" alt="image-20211121175841750"></p>
<p>&#x200B;                                    <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121175921192.png" alt="image-20211121175921192"></p>
<h5 id="git-checkout-&#x5206;&#x652F;&#x540D;--------------&#x2014;&#x2014;&#x5207;&#x6362;&#x5206;&#x652F;"><strong><code>git checkout &#x5206;&#x652F;&#x540D;</code>              &#x2014;&#x2014;&#x5207;&#x6362;&#x5206;&#x652F;</strong></h5>
<p>&#x200B;                                <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121180019121.png" alt="image-20211121180019121"></p>
<p>&#x200B;                                <strong><code>git merge &#x5206;&#x652F;&#x540D;</code>                    &#x2014;&#x2014;&#x5408;&#x5E76;&#x5206;&#x652F;</strong></p>
<blockquote>
<p><img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121182559209.png" alt="image-20211121182559209"></p>
<p>&#x6CE8;&#x610F;&#x4E0A;&#x8FB9;faster forward&#x4FE1;&#x606F;get&#x544A;&#x8BC9;&#x6211;&#x4EEC;&#xFF0C;&#x8FD9;&#x6B21;&#x5408;&#x5E76;&#x662F;&#x201D;&#x5FEB;&#x901F;&#x6A21;&#x5F0F;&#x201C;&#x4E5F;&#x5C31;&#x662F;&#x76F4;&#x63A5;&#x628A;master&#x6307;&#x5411;dev&#x7684;&#x5F53;&#x524D;&#x63D0;&#x4EA4;&#xFF0C;&#x6240;&#x4EE5;&#x5408;&#x5E76;&#x901F;&#x5EA6;&#x975E;&#x5E38;&#x5FEB;</p>
<ul>
<li><a href="">&#x5FEB;&#x901F;&#x5408;&#x5E76;&#xFF1A;&#x76F4;&#x63A5;&#x628A;  HEAD&#x6307;&#x5411;master &#x5E76;&#x8BA9;master&#x6307;&#x5411; &#x5206;&#x652F;&#x540D;&#x6240;&#x5728;&#x7684;&#x7248;&#x672C;</a></li>
<li>&#x6709;&#x4E9B;&#x65F6;&#x5019;&#x4E0D;&#x80FD;&#x4F7F;&#x7528;&#x5FEB;&#x901F;&#x5408;&#x5E76;&#xFF0C;&#x80FD;&#x4F7F;&#x7528;&#x4F1A;&#x9ED8;&#x8BA4;&#x4F7F;&#x7528;</li>
</ul>
</blockquote>
<p><img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121180124966.png" alt="image-20211121180124966"></p>
<p>&#x200B;                                <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121180134145.png" alt="image-20211121180134145"></p>
<h5 id="git-branch--d-&#x5206;&#x652F;&#x540D;-----------&#x2014;&#x2014;&#x5220;&#x9664;&#x5206;&#x652F;"><strong><code>git branch -d &#x5206;&#x652F;&#x540D;</code>           &#x2014;&#x2014;&#x5220;&#x9664;&#x5206;&#x652F;</strong></h5>
<pre><code>     3.&#x89E3;&#x51B3;&#x51B2;&#x7A81;
</code></pre><p>&#x200B;            &#x5408;&#x5E76;&#x5206;&#x652F;&#x4E5F;&#x4E0D;&#x662F;&#x4E00;&#x5E06;&#x98CE;&#x987A;&#x7684;</p>
<p>&#x200B;                                <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121184312774.png" alt="image-20211121184312774" style="zoom: 33%;"><img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121184336757.png" alt="image-20211121184336757" style="zoom: 33%;"></p>
<ul>
<li><p>[x] &#x200B;    &#x6F14;&#x793A;&#xFF1A;            </p>
<ul>
<li><p>[ ] &#x5728;dev&#x5206;&#x652F;&#x4E0A;&#x7F16;&#x8F91;&#x6587;&#x4EF6;&#xFF0C;&#x63D0;&#x4EA4;&#x6682;&#x5B58;&#x533A;  &#x4FDD;&#x5B58;&#x7248;&#x672C;</p>
</li>
<li><p>[ ] &#x5207;&#x6362;&#x4F1A;master&#x5206;&#x652F; </p>
</li>
<li><p>[ ] &#x5728;maste&#x5206;&#x652F;&#x4E0A;&#x7F16;&#x8F91;&#x6587;&#x4EF6;&#xFF0C;&#x63D0;&#x4EA4;&#x6682;&#x5B58;&#x533A;  &#x4FDD;&#x5B58;&#x7248;&#x672C;</p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121184838281.png" alt="image-20211121184838281" style="zoom:50%;"><img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121184847413.png" alt="image-20211121184847413" style="zoom:50%;"></p>
</li>
<li><p>[ ] &#x4F1A;&#x51FA;&#x73B0;&#x4EE5;&#x4E0B;&#x60C5;&#x51B5;</p>
<p>&#x200B;                <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121185042150.png" alt="image-20211121185042150"></p>
</li>
<li><p>[ ] vi &#x7F16;&#x8F91;&#x51B2;&#x7A81;&#x6587;&#x4EF6;</p>
<p>&#x200B;                <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121185347984.png" alt="image-20211121185347984"></p>
</li>
</ul>
</li>
</ul>
<pre><code>                     &gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&#x5206;&#x652F;&#x540D;  &#x4E0B;     &#x8868;&#x793A;&#xFF1A;&#x5BF9;&#x5E94;&#x5206;&#x652F;&#x91CC;&#x7684;&#x5185;&#x5BB9;

- &#x200B;        **&#x624B;&#x52A8;&#x878D;&#x5408;&#xFF1A;&#x628A;    &gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&#x5206;&#x652F;&#x540D; &#x5220;&#x6389;&#xFF0C;&#x518D;&#x63D0;&#x4EA4;&#x6682;&#x5B58;&#x533A;                                  &#x521B;&#x5EFA;&#x7248;&#x672C;**    
</code></pre><p>  <a href="">&#x5728;&#x4E24;&#x4E2A;&#x5206;&#x652F;&#x4E0A;&#x90FD;&#x6709;&#x4E86;&#x65B0;&#x63D0;&#x4EA4;&#xFF0C;&#x5E76;&#x4E14;&#x8FD8;&#x662F;&#x540C;&#x4E00;&#x4E2A;&#x6587;&#x4EF6; &#x4F1A;&#x51FA;&#x73B0;&#x8BE5;&#x51B2;&#x7A81;</a></p>
<p>  &#x200B;        4.&#x5206;&#x652F;&#x7BA1;&#x7406;&#x7B56;&#x7565;                </p>
<blockquote>
<p>&#x200B;            &#x901A;&#x5E38;&#xFF0C;&#x5408;&#x5E76;&#x5206;&#x652F;&#x65F6;&#xFF0C;&#x5982;&#x679C;&#x52A0;&#x5165;&#x53EF;&#x80FD; git&#x4F1A;&#x7528;faster forward&#x6A21;&#x5F0F;&#xFF0C;&#x4F46;&#x662F;&#x6709;&#x4E9B;&#x5FEB;&#x901F;&#x5408;&#x5E76;&#x4E0D;&#x80FD;&#x6210;&#x529F;&#x800C;&#x4E14;&#x5408;&#x5E76;&#x65F6;&#x6CA1;&#x6709;&#x51B2;&#x7A81;&#xFF0C;&#x8FD9;&#x4E2A;&#x65F6;&#x5019;&#x4F1A;                          &#x5408;&#x5E76;&#x4E4B;&#x540E;&#x5E76;&#x505A;&#x4E00;&#x6B21;&#x65B0;&#x7684;&#x63D0;&#x4EA4;</p>
<p>&#x200B;            <a href="">&#x4F46;&#x8FD9;&#x79CD;&#x6A21;&#x5F0F;&#x4E0B;&#xFF0C;&#x5220;&#x9664;&#x5206;&#x652F;&#x540E;&#xFF0C;&#x4F1A;&#x4E22;&#x6389;&#x5206;&#x652F;&#x4FE1;&#x606F;</a></p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121193907038.png" alt="image-20211121193907038"></p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121203107257.png" alt="image-20211121203107257"></p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121203619055.png" alt="image-20211121203619055" style="zoom:50%;"></p>
<p>&#x200B;            &#x7528;<code>git log --pretty=oneline</code>&#x67E5;&#x770B;&#x4F1A;&#x770B;&#x5230;&#x4E00;&#x6B21;&#x5FC3;&#x5F97;&#x7248;&#x672C;&#x63D0;&#x4EA4;&#xFF08;git&#x5E2E;&#x6211;&#x4EEC;&#x505A;&#x7684;&#xFF09;</p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121203856500.png" alt="image-20211121203856500" style="zoom:67%;"></p>
<p>&#x200B;            &#xFF08;6&#xFF09;&#x4F7F;&#x7528;&#x5206;&#x652F;&#x547D;&#x4EE4;&#x67E5;&#x770B;&#x5206;&#x652F;&#x4FE1;&#x606F;</p>
<p>&#x200B;              <code>git log --pretty=oneline --grapy</code>&#x53EF;&#x4EE5;&#x67E5;&#x770B;&#x975E;&#x5FEB;&#x901F;&#x5408;&#x5E76;&#x7684;&#x8FC7;&#x7A0B;</p>
<p><img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211121202748531.png" alt="image-20211121202748531" style="zoom: 67%;"></p>
<p>&#x200B;            &#xFF08;7&#xFF09;&#x5220;&#x9664;fu&#x5206;&#x652F;    </p>
<p>&#x200B;                <code>git branch -d fu</code></p>
<p>&#x5982;&#x679C;&#x8981;&#x5F3A;&#x5236;&#x7981;&#x7528;fast forward&#x6A21;&#x5F0F;&#xFF0C;get&#x5C31;&#x4F1A;&#x5728;merge&#x65F6;&#x751F;&#x6210;&#x4E00;&#x4E2A;&#x65B0;&#x7684;commit&#xFF0C;&#x8FD9;&#x6837;&#x4ECE;&#x5206;&#x652F;&#x5386;&#x53F2;&#x4E0A;&#x5C31;&#x53EF;&#x4EE5;&#x770B;&#x51FA;&#x5206;&#x652F;&#x4FE1;&#x606F;</p>
<p><img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211125213213619.png" alt="image-20211125213213619"></p>
<p><img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211125213250164.png" alt="image-20211125213250164"></p>
</blockquote>
<p>&#x200B;        5.bug&#x5206;&#x652F;</p>
<p>&#x200B;            &#x8F6F;&#x4EF6;&#x5F00;&#x53D1;&#x4E2D;&#xFF0C;bug&#x9700;&#x8981;&#x4FEE;&#x590D;&#xFF0C;&#x5728;git&#x4E2D;&#x7531;&#x4E8E;&#x5206;&#x652F;&#x5982;&#x6B64;&#x5F3A;&#x5927;&#xFF0C;&#x6240;&#x4EE5;  <a href="">&#x6BCF;&#x4E2A;bug&#x90FD;&#x53EF;&#x4EE5;&#x901A;&#x8FC7;&#x4E00;&#x4E2A;&#x65B0;&#x7684;&#x4E34;&#x65F6;&#x5206;&#x652F;&#x6765;&#x4FEE;&#x590D;&#xFF0C;&#x4FEE;&#x590D;&#x540E;&#x540E;&#xFF0C;&#x5408;&#x5E76;&#x5206;&#x652F;&#xFF0C;&#x7136;&#x540E;&#x5C06;&#x4E34;&#x65F6;&#x5206;&#x652F;&#x5220;&#x9664;</a></p>
<p>&#x200B;            (1)&#x5F53;&#x63A5;&#x5230;&#x4E00;&#x4E2A;&#x4FEE;&#x590D;&#x5E26;&#x597D;001&#x7684;bug&#x65F6;&#xFF0C;&#x4F60;&#x8981;&#x521B;&#x5EFA;&#x4E00;&#x4E2A;&#x5206;&#x652F;bug&#x2014;001&#x6765;&#x4FEE;&#x590D;&#x5B83;&#xFF0C;&#x4F46;&#x5F53;&#x524D;&#x6B63;&#x5728;dev&#x5206;&#x652F;&#x4E0A;&#x8FDB;&#x884C;&#x5DE5;&#x4F5C;&#x8FD8;&#x6CA1;&#x6709;&#x63D0;&#x4EA4;</p>
<p>&#x200B;                            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211128202208833.png" alt="image-20211128202208833"></p>
<p>&#x200B;            (2)git&#x8FD8;&#x63D0;&#x4F9B;&#x4E86;&#x4E00;&#x4E2A;atash&#x529F;&#x80FD;&#xFF0C;&#x53EF;&#x4EE5;&#x628A;&#x5F53;&#x524D;&#x5DE5;&#x4F5C;&#x73B0;&#x573A;&quot;&#x50A8;&#x5B58;&quot;&#x8D77;&#x6765;&#xFF0C;&#x7B49;&#x4EE5;&#x540E;&#x56DE;&#x590D;&#x73B0;&#x573A;&#x540E;&#x7EE7;&#x7EED;&#x5DE5;&#x4F5C;</p>
<p>&#x200B;                            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211128202652127.png" alt="image-20211128202652127"></p>
<p>&#x200B;            &#x8FD9;&#x4E2A;&#x65F6;&#x5019;git status&#x5C31;&#x4F1A;&#x663E;&#x793A;&#x5DE5;&#x4F5C;&#x533A;&#x5E72;&#x51C0;</p>
<p>&#x200B;            &#xFF08;3)&#x9996;&#x5148;&#x786E;&#x5B9A;&#x5728;&#x4E43;&#x4E2A;&#x5206;&#x652F;&#x4E0A;&#x4FEE;&#x590D;bug&#xFF0C;&#x5609;&#x5B9A;&#x9700;&#x8981;&#x5728;master&#x5206;&#x652F;&#x4E0A;&#x4FEE;&#x590D;&#xFF0C;&#x5C31;&#x4ECE;master&#x4E0A;&#x521B;&#x5EFA;&#x521B;&#x5EFA;&#x4E34;&#x65F6;&#x5206;&#x652F;        </p>
<p>&#x200B;                            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211128202840174.png" alt="">    </p>
<p>&#x200B;               (4)&#x73B0;&#x5728;&#x4FEE;&#x590D;bug&#xFF0C;&#x628A;the new line&#x5220;&#x6389;&#xFF0C;&#x7136;&#x540E;&#x63D0;&#x4EA4;[git add code.txt   git commit -m &quot;&#x4FEE;&#x590D;bug-001&quot;]</p>
<p>&#x200B;                            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211129212357170.png" alt="image-20211129212357170"></p>
<p>&#x200B;                    (5)&#x4FEE;&#x590D;&#x5B8C;&#x6210;&#x4E4B;&#x540E;&#xFF0C;&#x5207;&#x6362;&#x5230;maser&#x5206;&#x652F;&#xFF0C;&#x5E76;&#x5B8C;&#x6210;&#x5408;&#x5E76;&#xFF0C;&#x6700;&#x540E;&#x5220;&#x9664;bug-001&#x5206;&#x652F;</p>
<p>&#x200B;                                <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211129213658735.png" alt="image-20211129213658735">                    </p>
<p>&#x200B;                            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211129212715305.png" alt="image-20211129212715305"></p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211129213040603.png" alt="image-20211129213040603"></p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211129213759336.png" alt="image-20211129213759336"></p>
<p>&#x200B;            <img src="https://gitee.com/lichaikui/picture/raw/master/tupian/image-20211129213832136.png" alt="image-20211129213832136">    </p>

                                
                                </section>
                            
    </div>
    <div class="search-results">
        <div class="has-results">
            
            <h1 class="search-results-title"><span class='search-results-count'></span> results matching "<span class='search-query'></span>"</h1>
            <ul class="search-results-list"></ul>
            
        </div>
        <div class="no-results">
            
            <h1 class="search-results-title">No results matching "<span class='search-query'></span>"</h1>
            
        </div>
    </div>
</div>

                        </div>
                    </div>
                
            </div>

            
                
                <a href="git安装及使用.html" class="navigation navigation-prev " aria-label="Previous page: git安装及使用">
                    <i class="fa fa-angle-left"></i>
                </a>
                
                
                <a href="github使用.html" class="navigation navigation-next " aria-label="Next page: github使用">
                    <i class="fa fa-angle-right"></i>
                </a>
                
            
        
    </div>

    <script>
        var gitbook = gitbook || [];
        gitbook.push(function() {
            gitbook.page.hasChanged({"page":{"title":"git分支管理","level":"4.2.3","depth":2,"next":{"title":"github使用","level":"4.3","depth":1,"path":"阶段二笔记/github使用.md","ref":"./阶段二笔记/github使用.md","articles":[]},"previous":{"title":"git安装及使用","level":"4.2.2","depth":2,"path":"阶段二笔记/git安装及使用.md","ref":"./阶段二笔记/git安装及使用.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":["livereload"],"pluginsConfig":{"livereload":{},"highlight":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"fontsettings":{"theme":"white","family":"sans","size":2},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"阶段二笔记/git分支管理.md","mtime":"2022-01-10T16:19:03.061Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2022-03-24T13:44:59.630Z"},"basePath":"..","book":{"language":""}});
        });
    </script>
</div>

        
    <script src="../gitbook/gitbook.js"></script>
    <script src="../gitbook/theme.js"></script>
    
        
        <script src="../gitbook/gitbook-plugin-livereload/plugin.js"></script>
        
    
        
        <script src="../gitbook/gitbook-plugin-search/search-engine.js"></script>
        
    
        
        <script src="../gitbook/gitbook-plugin-search/search.js"></script>
        
    
        
        <script src="../gitbook/gitbook-plugin-lunr/lunr.min.js"></script>
        
    
        
        <script src="../gitbook/gitbook-plugin-lunr/search-lunr.js"></script>
        
    
        
        <script src="../gitbook/gitbook-plugin-sharing/buttons.js"></script>
        
    
        
        <script src="../gitbook/gitbook-plugin-fontsettings/fontsettings.js"></script>
        
    

    </body>
</html>

